Re-arrange dimension order